From: M A Young Date: Tue, 11 Nov 2014 20:28:38 +0000 (+0000) Subject: fix commit xen/arm: Add support for GICv3 for domU X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~4098 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22?a=commitdiff_plain;h=608aae36bba86cd2f3656910f3f3b079e53b9aa2;p=xen.git fix commit xen/arm: Add support for GICv3 for domU The build of xen-4.5.0-rc2 fails if XSM_ENABLE=y due to an inconsistency in commit fda1614 "xen/arm: Add support for GICv3 for domU" which uses XEN_DOMCTL_configure_domain in xen/xsm/flask/hooks.c and xen/xsm/flask/policy/access_vectors but XEN_DOMCTL_arm_configure_domain elsewhere. Michael Young In fda1614 ("xen/arm: Add support for GICv3 for domU") XEN_DOMCTL_configure_domain is used in xen/xsm/flask/hooks.c and xen/xsm/flask/policy/access_vectors but XEN_DOMCTL_arm_configure_domain is used elsewhere. Signed-off-by: Michael Young Acked-by: Ian Campbell --- diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 846cf88abb..0ba2ce90c1 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -727,7 +727,7 @@ static int flask_domctl(struct domain *d, int cmd) case XEN_DOMCTL_psr_cmt_op: return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__PSR_CMT_OP); - case XEN_DOMCTL_configure_domain: + case XEN_DOMCTL_arm_configure_domain: return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__CONFIGURE_DOMAIN); default: diff --git a/xen/xsm/flask/policy/access_vectors b/xen/xsm/flask/policy/access_vectors index bfe2fa5638..1cd451e4c7 100644 --- a/xen/xsm/flask/policy/access_vectors +++ b/xen/xsm/flask/policy/access_vectors @@ -102,7 +102,7 @@ class domain unpause # XEN_DOMCTL_resumedomain resume -# XEN_DOMCTL_createdomain +# XEN_DOMCTL_arm_createdomain create # checked in FLASK_RELABEL_DOMAIN for any relabel operation: # source = the old label of the domain